Added a staging area endpoint that accepts raw JSON for direct insertion #222
Conversation
| public ResponseEntity<Object> createEntity(@RequestBody String newEntity, | ||
| @RequestParam Map<String, String> queryParameters) throws Exception { | ||
| log.trace("in createEntity"); | ||
| String entityType = queryParameters.get("entityType");//type of domain object to create |
There was a problem hiding this comment.
Won't this be a POST at a level like "/api/v1/substances/stagingArea", does the client really need to tell you it's for substances again?
There was a problem hiding this comment.
That's a good point.
We have the same requirement for the /import endpoint and I copied it.
The other issue: how do we map from 'substances' to 'ix.ginas.models.v1.Substance?'
| log.trace("in createEntity"); | ||
| String entityType = queryParameters.get("entityType");//type of domain object to create | ||
| Objects.requireNonNull(entityType, "Must supply entityType (class of object to create)"); | ||
| String adapterName = queryParameters.get("adapter"); |
There was a problem hiding this comment.
In this particular case I think we're expecting they're POSTing the JSON directly, so they shouldn't need an adapter?
There was a problem hiding this comment.
Or if it is an adapter, it should be essentially a no-op one?
There was a problem hiding this comment.
I added the adapter parameter because it's used within the formalism of the ImportTaskMetaData.
But omitting a value in a POST worked fine.
|
|
||
| String fileName = queryParameters.containsKey("fileName") ? queryParameters.get("fileName") : "POSTed JSON"; | ||
| StagingAreaService stagingAreaService = getDefaultStagingAreaService(); | ||
| ImportUtilities<T> importUtilities = new ImportUtilities<>(getEntityService().getContext(), getEntityService().getEntityClass(), |
There was a problem hiding this comment.
This feels like it should already be in a registry, is it?
| task.setInternalUuid(UUID.randomUUID()); | ||
| task.setSize((long) newEntity.length()); | ||
| task.setAdapterSettings(JsonNodeFactory.instance.objectNode()); | ||
| String result= importUtilities.saveStagingAreaRecord(newEntity, task, null); |
There was a problem hiding this comment.
You could figure out the user here, no? And pass it? I think it's probably better to do that?
There was a problem hiding this comment.
The user is figured out by ImportUtilities. I avoided duplicating the process here.
| @@ -679,6 +679,34 @@ public ResponseEntity<Object> updateImport(@RequestBody JsonNode updatedJson, | |||
| return new ResponseEntity<>(GsrsControllerUtil.enhanceWithView(itmd, queryParameters), HttpStatus.OK); | |||
| } | |||
|
|
|||
| @hasAdminRole | |||
There was a problem hiding this comment.
We may need to adjust this for staging area and have some more configurable set of roles that can see the staging area. I currently think it may be best for super users or perhaps even users that are in a specific group ... maybe admins or "staging area registrars"? Can we make this configurable somehow?
There was a problem hiding this comment.
This makes sense.
ChemMitch
changed the title
into the staging area.